Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Wed, 24 Feb 2016 19:26:20 +0000 (14:26 -0500)
committerTom Rini <[email protected]>
Wed, 24 Feb 2016 23:44:17 +0000 (18:44 -0500)

Trivial merge